You have 8 PRs in flight. Two of them will break each other.

Not a merge conflict — git handles those. A semantic conflict: both PRs modify the User model's validations. Both pass CI independently. Both merge cleanly. The combined behavior is wrong. You find out after both land.

What /conflicts does

You:   /conflicts

Claude: CONFLICT MATRIX
                 #42    #57    #63
        #42       —     HIGH    —
        #57      HIGH    —      —
        #63       —      —      —

        SEMANTIC CONFLICT: #42 × #57
        Both modify app/models/user.rb validations
        #42 adds role column, #57 adds tier column
        Merged validations may conflict

        RECOMMENDED MERGE ORDER:
        1. #42 (auth-refactor) — no deps
        2. #57 (pricing-v2) — rebase after #42
        3. #63 (ui-polish) — independent

Detects textual overlaps, semantic collisions (competing state machines, shared APIs), migration race conditions, and dependency conflicts. Recommends merge ordering.

Only .tmpl committed — bun run gen:skill-docs generates the rest.

Test plan

• .tmpl follows template pipeline
• Registered in gen-skill-docs.ts, skill-check.ts, test files